Rename a bunch of private headers
authorMatthias Clasen <mclasen@redhat.com>
Mon, 10 Jun 2019 03:10:13 +0000 (03:10 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 10 Jun 2019 03:10:13 +0000 (03:10 +0000)
We want to follow the convention that all
private headers have names ending in private.h

27 files changed:
gtk/gtkactionhelper.c
gtk/gtkactionmuxer.c
gtk/gtkactionobservable.c
gtk/gtkactionobservable.h [deleted file]
gtk/gtkactionobservableprivate.h [new file with mode: 0644]
gtk/gtkactionobserver.c
gtk/gtkactionobserver.h [deleted file]
gtk/gtkactionobserverprivate.h [new file with mode: 0644]
gtk/gtkapplication-quartz-menu.c
gtk/gtkmenusectionbox.c
gtk/gtkmenusectionbox.h [deleted file]
gtk/gtkmenusectionboxprivate.h [new file with mode: 0644]
gtk/gtkmenushell.c
gtk/gtkmenushellprivate.h
gtk/gtkmenutracker.c
gtk/gtkmenutracker.h [deleted file]
gtk/gtkmenutrackeritem.c
gtk/gtkmenutrackeritem.h [deleted file]
gtk/gtkmenutrackeritemprivate.h [new file with mode: 0644]
gtk/gtkmenutrackerprivate.h [new file with mode: 0644]
gtk/gtkmodelbutton.c
gtk/gtkmodelmenuitem.c
gtk/gtkmodelmenuitem.h [deleted file]
gtk/gtkmodelmenuitemprivate.h [new file with mode: 0644]
gtk/gtkpopover.c
gtk/gtkpopovermenu.c
gtk/gtkpopovermenubar.c

index f82b16f0121f72e3e29c71df8c52545fec549c8a..c5f4356b2b56e48c09c2af966f27b52882ca54ad 100644 (file)
@@ -18,7 +18,7 @@
  */
 
 #include "gtkactionhelperprivate.h"
-#include "gtkactionobservable.h"
+#include "gtkactionobservableprivate.h"
 
 #include "gtkwidgetprivate.h"
 #include "gtkdebug.h"
index 126c94aa80ba3dee41cfcb3983d2367f650d980d..72edec793b7b082ca1a73db76ac943f4945f2847 100644 (file)
@@ -21,8 +21,8 @@
 
 #include "gtkactionmuxerprivate.h"
 
-#include "gtkactionobservable.h"
-#include "gtkactionobserver.h"
+#include "gtkactionobservableprivate.h"
+#include "gtkactionobserverprivate.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 
index ab90df2e5939105f651342a4895a93beb1f1c872..914f24b052ab836fea45e31d1a69b7a4b073421c 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtkactionobservable.h"
+#include "gtkactionobservableprivate.h"
 
 G_DEFINE_INTERFACE (GtkActionObservable, gtk_action_observable, G_TYPE_OBJECT)
 
diff --git a/gtk/gtkactionobservable.h b/gtk/gtkactionobservable.h
deleted file mode 100644 (file)
index aa1514b..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_ACTION_OBSERVABLE_H__
-#define __GTK_ACTION_OBSERVABLE_H__
-
-#include "gtkactionobserver.h"
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_OBSERVABLE                          (gtk_action_observable_get_type ())
-#define GTK_ACTION_OBSERVABLE(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             GTK_TYPE_ACTION_OBSERVABLE, GtkActionObservable))
-#define GTK_IS_ACTION_OBSERVABLE(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             GTK_TYPE_ACTION_OBSERVABLE))
-#define GTK_ACTION_OBSERVABLE_GET_IFACE(inst)               (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             GTK_TYPE_ACTION_OBSERVABLE,                             \
-                                                             GtkActionObservableInterface))
-
-typedef struct _GtkActionObservableInterface                GtkActionObservableInterface;
-
-struct _GtkActionObservableInterface
-{
-  GTypeInterface g_iface;
-
-  void (* register_observer)   (GtkActionObservable *observable,
-                                const gchar         *action_name,
-                                GtkActionObserver   *observer);
-  void (* unregister_observer) (GtkActionObservable *observable,
-                                const gchar         *action_name,
-                                GtkActionObserver   *observer);
-};
-
-GType                   gtk_action_observable_get_type                  (void);
-void                    gtk_action_observable_register_observer         (GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         GtkActionObserver   *observer);
-void                    gtk_action_observable_unregister_observer       (GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         GtkActionObserver   *observer);
-
-G_END_DECLS
-
-#endif /* __GTK_ACTION_OBSERVABLE_H__ */
diff --git a/gtk/gtkactionobservableprivate.h b/gtk/gtkactionobservableprivate.h
new file mode 100644 (file)
index 0000000..d82c897
--- /dev/null
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * licence or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_ACTION_OBSERVABLE_PRIVATE_H__
+#define __GTK_ACTION_OBSERVABLE_PRIVATE_H__
+
+#include "gtkactionobserverprivate.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_ACTION_OBSERVABLE                          (gtk_action_observable_get_type ())
+#define GTK_ACTION_OBSERVABLE(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             GTK_TYPE_ACTION_OBSERVABLE, GtkActionObservable))
+#define GTK_IS_ACTION_OBSERVABLE(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             GTK_TYPE_ACTION_OBSERVABLE))
+#define GTK_ACTION_OBSERVABLE_GET_IFACE(inst)               (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
+                                                             GTK_TYPE_ACTION_OBSERVABLE,                             \
+                                                             GtkActionObservableInterface))
+
+typedef struct _GtkActionObservableInterface                GtkActionObservableInterface;
+
+struct _GtkActionObservableInterface
+{
+  GTypeInterface g_iface;
+
+  void (* register_observer)   (GtkActionObservable *observable,
+                                const gchar         *action_name,
+                                GtkActionObserver   *observer);
+  void (* unregister_observer) (GtkActionObservable *observable,
+                                const gchar         *action_name,
+                                GtkActionObserver   *observer);
+};
+
+GType                   gtk_action_observable_get_type                  (void);
+void                    gtk_action_observable_register_observer         (GtkActionObservable *observable,
+                                                                         const gchar         *action_name,
+                                                                         GtkActionObserver   *observer);
+void                    gtk_action_observable_unregister_observer       (GtkActionObservable *observable,
+                                                                         const gchar         *action_name,
+                                                                         GtkActionObserver   *observer);
+
+G_END_DECLS
+
+#endif /* __GTK_ACTION_OBSERVABLE_PRIVATE_H__ */
index fda0ae73cc4a439c458fac5ab4a39f97c241c51b..3a5a9abb197d23d59e10b37621c9ec869a9312a9 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtkactionobserver.h"
+#include "gtkactionobserverprivate.h"
 
 G_DEFINE_INTERFACE (GtkActionObserver, gtk_action_observer, G_TYPE_OBJECT)
 
diff --git a/gtk/gtkactionobserver.h b/gtk/gtkactionobserver.h
deleted file mode 100644 (file)
index a4e9659..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * licence or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_ACTION_OBSERVER_H__
-#define __GTK_ACTION_OBSERVER_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ACTION_OBSERVER                            (gtk_action_observer_get_type ())
-#define GTK_ACTION_OBSERVER(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             GTK_TYPE_ACTION_OBSERVER, GtkActionObserver))
-#define GTK_IS_ACTION_OBSERVER(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             GTK_TYPE_ACTION_OBSERVER))
-#define GTK_ACTION_OBSERVER_GET_IFACE(inst)                 (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
-                                                             GTK_TYPE_ACTION_OBSERVER, GtkActionObserverInterface))
-
-typedef struct _GtkActionObserverInterface                  GtkActionObserverInterface;
-typedef struct _GtkActionObservable                         GtkActionObservable;
-typedef struct _GtkActionObserver                           GtkActionObserver;
-
-struct _GtkActionObserverInterface
-{
-  GTypeInterface g_iface;
-
-  void (* action_added)           (GtkActionObserver    *observer,
-                                   GtkActionObservable  *observable,
-                                   const gchar          *action_name,
-                                   const GVariantType   *parameter_type,
-                                   gboolean              enabled,
-                                   GVariant             *state);
-  void (* action_enabled_changed) (GtkActionObserver    *observer,
-                                   GtkActionObservable  *observable,
-                                   const gchar          *action_name,
-                                   gboolean              enabled);
-  void (* action_state_changed)   (GtkActionObserver    *observer,
-                                   GtkActionObservable  *observable,
-                                   const gchar          *action_name,
-                                   GVariant             *state);
-  void (* action_removed)         (GtkActionObserver    *observer,
-                                   GtkActionObservable  *observable,
-                                   const gchar          *action_name);
-  void (* primary_accel_changed)  (GtkActionObserver    *observer,
-                                   GtkActionObservable  *observable,
-                                   const gchar          *action_name,
-                                   const gchar          *action_and_target);
-};
-
-GType                   gtk_action_observer_get_type                    (void);
-void                    gtk_action_observer_action_added                (GtkActionObserver   *observer,
-                                                                         GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         const GVariantType  *parameter_type,
-                                                                         gboolean             enabled,
-                                                                         GVariant            *state);
-void                    gtk_action_observer_action_enabled_changed      (GtkActionObserver   *observer,
-                                                                         GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         gboolean             enabled);
-void                    gtk_action_observer_action_state_changed        (GtkActionObserver   *observer,
-                                                                         GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         GVariant            *state);
-void                    gtk_action_observer_action_removed              (GtkActionObserver   *observer,
-                                                                         GtkActionObservable *observable,
-                                                                         const gchar         *action_name);
-void                    gtk_action_observer_primary_accel_changed       (GtkActionObserver   *observer,
-                                                                         GtkActionObservable *observable,
-                                                                         const gchar         *action_name,
-                                                                         const gchar         *action_and_target);
-
-G_END_DECLS
-
-#endif /* __GTK_ACTION_OBSERVER_H__ */
diff --git a/gtk/gtkactionobserverprivate.h b/gtk/gtkactionobserverprivate.h
new file mode 100644 (file)
index 0000000..a1a31cc
--- /dev/null
@@ -0,0 +1,91 @@
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * licence or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_ACTION_OBSERVER_PRIVATE_H__
+#define __GTK_ACTION_OBSERVER_PRIVATE_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_ACTION_OBSERVER                            (gtk_action_observer_get_type ())
+#define GTK_ACTION_OBSERVER(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             GTK_TYPE_ACTION_OBSERVER, GtkActionObserver))
+#define GTK_IS_ACTION_OBSERVER(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             GTK_TYPE_ACTION_OBSERVER))
+#define GTK_ACTION_OBSERVER_GET_IFACE(inst)                 (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
+                                                             GTK_TYPE_ACTION_OBSERVER, GtkActionObserverInterface))
+
+typedef struct _GtkActionObserverInterface                  GtkActionObserverInterface;
+typedef struct _GtkActionObservable                         GtkActionObservable;
+typedef struct _GtkActionObserver                           GtkActionObserver;
+
+struct _GtkActionObserverInterface
+{
+  GTypeInterface g_iface;
+
+  void (* action_added)           (GtkActionObserver    *observer,
+                                   GtkActionObservable  *observable,
+                                   const gchar          *action_name,
+                                   const GVariantType   *parameter_type,
+                                   gboolean              enabled,
+                                   GVariant             *state);
+  void (* action_enabled_changed) (GtkActionObserver    *observer,
+                                   GtkActionObservable  *observable,
+                                   const gchar          *action_name,
+                                   gboolean              enabled);
+  void (* action_state_changed)   (GtkActionObserver    *observer,
+                                   GtkActionObservable  *observable,
+                                   const gchar          *action_name,
+                                   GVariant             *state);
+  void (* action_removed)         (GtkActionObserver    *observer,
+                                   GtkActionObservable  *observable,
+                                   const gchar          *action_name);
+  void (* primary_accel_changed)  (GtkActionObserver    *observer,
+                                   GtkActionObservable  *observable,
+                                   const gchar          *action_name,
+                                   const gchar          *action_and_target);
+};
+
+GType                   gtk_action_observer_get_type                    (void);
+void                    gtk_action_observer_action_added                (GtkActionObserver   *observer,
+                                                                         GtkActionObservable *observable,
+                                                                         const gchar         *action_name,
+                                                                         const GVariantType  *parameter_type,
+                                                                         gboolean             enabled,
+                                                                         GVariant            *state);
+void                    gtk_action_observer_action_enabled_changed      (GtkActionObserver   *observer,
+                                                                         GtkActionObservable *observable,
+                                                                         const gchar         *action_name,
+                                                                         gboolean             enabled);
+void                    gtk_action_observer_action_state_changed        (GtkActionObserver   *observer,
+                                                                         GtkActionObservable *observable,
+                                                                         const gchar         *action_name,
+                                                                         GVariant            *state);
+void                    gtk_action_observer_action_removed              (GtkActionObserver   *observer,
+                                                                         GtkActionObservable *observable,
+                                                                         const gchar         *action_name);
+void                    gtk_action_observer_primary_accel_changed       (GtkActionObserver   *observer,
+                                                                         GtkActionObservable *observable,
+                                                                         const gchar         *action_name,
+                                                                         const gchar         *action_and_target);
+
+G_END_DECLS
+
+#endif /* __GTK_ACTION_OBSERVER_PRIVATE_H__ */
index 0e2567fca777d358bb90ce730522dde175517737..6478c70d0568ba638aef12d107a0b9961e53845f 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include "gtkapplicationprivate.h"
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
 #include "gtkicontheme.h"
 #include "gtktoolbarprivate.h"
 #include "gtkquartz.h"
index 47f443b637f20148c141c6871f281b3a5661e4dd..0bb33cd68bd6d0a2785ea5760e1d70100d9a1124 100644 (file)
 
 #include "config.h"
 
-#include "gtkmenusectionbox.h"
+#include "gtkmenusectionboxprivate.h"
 
 #include "gtkwidgetprivate.h"
 #include "gtklabel.h"
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
 #include "gtkmodelbutton.h"
 #include "gtkseparator.h"
 #include "gtksizegroup.h"
diff --git a/gtk/gtkmenusectionbox.h b/gtk/gtkmenusectionbox.h
deleted file mode 100644 (file)
index c5d9772..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2014 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MENU_SECTION_BOX_H__
-#define __GTK_MENU_SECTION_BOX_H__
-
-#include <gtk/gtkmenutrackeritem.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkpopovermenu.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_MENU_SECTION_BOX                           (gtk_menu_section_box_get_type ())
-#define GTK_MENU_SECTION_BOX(inst)                          (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBox))
-#define GTK_MENU_SECTION_BOX_CLASS(class)                   (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBoxClass))
-#define GTK_IS_MENU_SECTION_BOX(inst)                       (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             GTK_TYPE_MENU_SECTION_BOX))
-#define GTK_IS_MENU_SECTION_BOX_CLASS(class)                (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             GTK_TYPE_MENU_SECTION_BOX))
-#define GTK_MENU_SECTION_BOX_GET_CLASS(inst)                (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBoxClass))
-
-typedef struct _GtkMenuSectionBox                           GtkMenuSectionBox;
-
-GType                   gtk_menu_section_box_get_type                   (void) G_GNUC_CONST;
-void                    gtk_menu_section_box_new_toplevel               (GtkPopoverMenu *popover,
-                                                                         GMenuModel     *model);
-
-G_END_DECLS
-
-#endif /* __GTK_MENU_SECTION_BOX_H__ */
diff --git a/gtk/gtkmenusectionboxprivate.h b/gtk/gtkmenusectionboxprivate.h
new file mode 100644 (file)
index 0000000..01508fe
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2014 Codethink Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_MENU_SECTION_BOX_PRIVATE_H__
+#define __GTK_MENU_SECTION_BOX_PRIVATE_H__
+
+#include <gtk/gtkmenutrackeritemprivate.h>
+#include <gtk/gtkbox.h>
+#include <gtk/gtkpopovermenu.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_MENU_SECTION_BOX                           (gtk_menu_section_box_get_type ())
+#define GTK_MENU_SECTION_BOX(inst)                          (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
+                                                             GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBox))
+#define GTK_MENU_SECTION_BOX_CLASS(class)                   (G_TYPE_CHECK_CLASS_CAST ((class),                       \
+                                                             GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBoxClass))
+#define GTK_IS_MENU_SECTION_BOX(inst)                       (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
+                                                             GTK_TYPE_MENU_SECTION_BOX))
+#define GTK_IS_MENU_SECTION_BOX_CLASS(class)                (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
+                                                             GTK_TYPE_MENU_SECTION_BOX))
+#define GTK_MENU_SECTION_BOX_GET_CLASS(inst)                (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
+                                                             GTK_TYPE_MENU_SECTION_BOX, GtkMenuSectionBoxClass))
+
+typedef struct _GtkMenuSectionBox                           GtkMenuSectionBox;
+
+GType                   gtk_menu_section_box_get_type                   (void) G_GNUC_CONST;
+void                    gtk_menu_section_box_new_toplevel               (GtkPopoverMenu *popover,
+                                                                         GMenuModel     *model);
+
+G_END_DECLS
+
+#endif /* __GTK_MENU_SECTION_BOX_PRIVATE_H__ */
index eb3ef711354ab26ec3109c323b544cbd33a69b89..55bea7ddb4504358b8ddea19917160ea279907ed 100644 (file)
@@ -68,7 +68,7 @@
 #include "gtkmenubarprivate.h"
 #include "gtkmenuitemprivate.h"
 #include "gtkmnemonichash.h"
-#include "gtkmodelmenuitem.h"
+#include "gtkmodelmenuitemprivate.h"
 #include "gtkprivate.h"
 #include "gtkseparatormenuitem.h"
 #include "gtktypebuiltins.h"
index 0c42c4d50d224ed3096d645e98508dce82bfc3f3..b966e686c3429a17b23db5d2a508d5e218b594c2 100644 (file)
@@ -22,7 +22,7 @@
 #include <gtk/gtkmenushell.h>
 #include <gtk/gtkmnemonichash.h>
 #include <gtk/gtkkeyhash.h>
-#include <gtk/gtkmenutracker.h>
+#include <gtk/gtkmenutrackerprivate.h>
 #include <gtk/gtkeventcontroller.h>
 
 G_BEGIN_DECLS
index 2d39319875023bcb9bd2a568dd1ba61f02145bba..6ec6c5ab07b4ebb4cf3b3d925b4bf3dba5df0469 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
 
 /*< private >
  * SECTION:gtkmenutracker
diff --git a/gtk/gtkmenutracker.h b/gtk/gtkmenutracker.h
deleted file mode 100644 (file)
index 35f4a09..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright © 2013 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MENU_TRACKER_H__
-#define __GTK_MENU_TRACKER_H__
-
-#include "gtkmenutrackeritem.h"
-
-typedef struct _GtkMenuTracker GtkMenuTracker;
-
-typedef void         (* GtkMenuTrackerInsertFunc)                       (GtkMenuTrackerItem       *item,
-                                                                         gint                      position,
-                                                                         gpointer                  user_data);
-
-typedef void         (* GtkMenuTrackerRemoveFunc)                       (gint                      position,
-                                                                         gpointer                  user_data);
-
-
-GtkMenuTracker *        gtk_menu_tracker_new                            (GtkActionObservable      *observer,
-                                                                         GMenuModel               *model,
-                                                                         gboolean                  with_separators,
-                                                                         gboolean                  merge_sections,
-                                                                         gboolean                  mac_os_mode,
-                                                                         const gchar              *action_namespace,
-                                                                         GtkMenuTrackerInsertFunc  insert_func,
-                                                                         GtkMenuTrackerRemoveFunc  remove_func,
-                                                                         gpointer                  user_data);
-
-GtkMenuTracker *        gtk_menu_tracker_new_for_item_link              (GtkMenuTrackerItem       *item,
-                                                                         const gchar              *link_name,
-                                                                         gboolean                  merge_sections,
-                                                                         gboolean                  mac_os_mode,
-                                                                         GtkMenuTrackerInsertFunc  insert_func,
-                                                                         GtkMenuTrackerRemoveFunc  remove_func,
-                                                                         gpointer                  user_data);
-
-void                    gtk_menu_tracker_free                           (GtkMenuTracker           *tracker);
-
-#endif /* __GTK_MENU_TRACKER_H__ */
index 80bf7116f91d904672bf0e0e47bfaefc0bf4f411..3cd4796e168af51254ba405bc372557554c875bd 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtkmenutrackeritem.h"
+#include "gtkmenutrackeritemprivate.h"
 #include "gtkactionmuxerprivate.h"
 #include "gtkdebug.h"
 #include "gtkintl.h"
diff --git a/gtk/gtkmenutrackeritem.h b/gtk/gtkmenutrackeritem.h
deleted file mode 100644 (file)
index 2f4f04a..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright © 2011, 2013 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MENU_TRACKER_ITEM_H__
-#define __GTK_MENU_TRACKER_ITEM_H__
-
-#include "gtkactionobservable.h"
-
-#define GTK_TYPE_MENU_TRACKER_ITEM                          (gtk_menu_tracker_item_get_type ())
-#define GTK_MENU_TRACKER_ITEM(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                                                             GTK_TYPE_MENU_TRACKER_ITEM, GtkMenuTrackerItem))
-#define GTK_IS_MENU_TRACKER_ITEM(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                                                             GTK_TYPE_MENU_TRACKER_ITEM))
-
-typedef struct _GtkMenuTrackerItem GtkMenuTrackerItem;
-
-#define GTK_TYPE_MENU_TRACKER_ITEM_ROLE                     (gtk_menu_tracker_item_role_get_type ())
-
-typedef enum  {
-  GTK_MENU_TRACKER_ITEM_ROLE_NORMAL,
-  GTK_MENU_TRACKER_ITEM_ROLE_CHECK,
-  GTK_MENU_TRACKER_ITEM_ROLE_RADIO,
-} GtkMenuTrackerItemRole;
-
-GType                   gtk_menu_tracker_item_get_type                  (void) G_GNUC_CONST;
-
-GType                   gtk_menu_tracker_item_role_get_type             (void) G_GNUC_CONST;
-
-GtkMenuTrackerItem *   _gtk_menu_tracker_item_new                       (GtkActionObservable *observable,
-                                                                         GMenuModel          *model,
-                                                                         gint                 item_index,
-                                                                         gboolean             mac_os_mode,
-                                                                         const gchar         *action_namespace,
-                                                                         gboolean             is_separator);
-
-const gchar *           gtk_menu_tracker_item_get_special               (GtkMenuTrackerItem *self);
-
-const gchar *           gtk_menu_tracker_item_get_display_hint          (GtkMenuTrackerItem *self);
-
-const gchar *           gtk_menu_tracker_item_get_text_direction        (GtkMenuTrackerItem *self);
-
-GtkActionObservable *  _gtk_menu_tracker_item_get_observable            (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_is_separator          (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_has_link              (GtkMenuTrackerItem *self,
-                                                                         const gchar        *link_name);
-
-const gchar *           gtk_menu_tracker_item_get_label                 (GtkMenuTrackerItem *self);
-
-GIcon *                 gtk_menu_tracker_item_get_icon                  (GtkMenuTrackerItem *self);
-
-GIcon *                 gtk_menu_tracker_item_get_verb_icon             (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_sensitive             (GtkMenuTrackerItem *self);
-
-GtkMenuTrackerItemRole  gtk_menu_tracker_item_get_role                  (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_toggled               (GtkMenuTrackerItem *self);
-
-const gchar *           gtk_menu_tracker_item_get_accel                 (GtkMenuTrackerItem *self);
-
-GMenuModel *           _gtk_menu_tracker_item_get_link                  (GtkMenuTrackerItem *self,
-                                                                         const gchar        *link_name);
-
-gchar *                _gtk_menu_tracker_item_get_link_namespace        (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_may_disappear             (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_is_visible            (GtkMenuTrackerItem *self);
-
-gboolean                gtk_menu_tracker_item_get_should_request_show   (GtkMenuTrackerItem *self);
-
-void                    gtk_menu_tracker_item_activated                 (GtkMenuTrackerItem *self);
-
-void                    gtk_menu_tracker_item_request_submenu_shown     (GtkMenuTrackerItem *self,
-                                                                         gboolean            shown);
-
-gboolean                gtk_menu_tracker_item_get_submenu_shown         (GtkMenuTrackerItem *self);
-
-#endif
diff --git a/gtk/gtkmenutrackeritemprivate.h b/gtk/gtkmenutrackeritemprivate.h
new file mode 100644 (file)
index 0000000..0e08f7e
--- /dev/null
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2011, 2013 Canonical Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_MENU_TRACKER_ITEM_PRIVATE_H__
+#define __GTK_MENU_TRACKER_ITEM_PRIVATE_H__
+
+#include "gtkactionobservableprivate.h"
+
+#define GTK_TYPE_MENU_TRACKER_ITEM                          (gtk_menu_tracker_item_get_type ())
+#define GTK_MENU_TRACKER_ITEM(inst)                         (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
+                                                             GTK_TYPE_MENU_TRACKER_ITEM, GtkMenuTrackerItem))
+#define GTK_IS_MENU_TRACKER_ITEM(inst)                      (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
+                                                             GTK_TYPE_MENU_TRACKER_ITEM))
+
+typedef struct _GtkMenuTrackerItem GtkMenuTrackerItem;
+
+#define GTK_TYPE_MENU_TRACKER_ITEM_ROLE                     (gtk_menu_tracker_item_role_get_type ())
+
+typedef enum  {
+  GTK_MENU_TRACKER_ITEM_ROLE_NORMAL,
+  GTK_MENU_TRACKER_ITEM_ROLE_CHECK,
+  GTK_MENU_TRACKER_ITEM_ROLE_RADIO,
+} GtkMenuTrackerItemRole;
+
+GType                   gtk_menu_tracker_item_get_type                  (void) G_GNUC_CONST;
+
+GType                   gtk_menu_tracker_item_role_get_type             (void) G_GNUC_CONST;
+
+GtkMenuTrackerItem *   _gtk_menu_tracker_item_new                       (GtkActionObservable *observable,
+                                                                         GMenuModel          *model,
+                                                                         gint                 item_index,
+                                                                         gboolean             mac_os_mode,
+                                                                         const gchar         *action_namespace,
+                                                                         gboolean             is_separator);
+
+const gchar *           gtk_menu_tracker_item_get_special               (GtkMenuTrackerItem *self);
+
+const gchar *           gtk_menu_tracker_item_get_display_hint          (GtkMenuTrackerItem *self);
+
+const gchar *           gtk_menu_tracker_item_get_text_direction        (GtkMenuTrackerItem *self);
+
+GtkActionObservable *  _gtk_menu_tracker_item_get_observable            (GtkMenuTrackerItem *self);
+
+gboolean                gtk_menu_tracker_item_get_is_separator          (GtkMenuTrackerItem *self);
+
+gboolean                gtk_menu_tracker_item_get_has_link              (GtkMenuTrackerItem *self,
+                                                                         const gchar        *link_name);
+
+const gchar *           gtk_menu_tracker_item_get_label                 (GtkMenuTrackerItem *self);
+
+GIcon *                 gtk_menu_tracker_item_get_icon                  (GtkMenuTrackerItem *self);
+
+GIcon *                 gtk_menu_tracker_item_get_verb_icon             (GtkMenuTrackerItem *self);
+
+gboolean                gtk_menu_tracker_item_get_sensitive             (GtkMenuTrackerItem *self);
+
+GtkMenuTrackerItemRole  gtk_menu_tracker_item_get_role                  (GtkMenuTrackerItem *self);
+
+gboolean                gtk_menu_tracker_item_get_toggled               (GtkMenuTrackerItem *self);
+
+const gchar *           gtk_menu_tracker_item_get_accel                 (GtkMenuTrackerItem *self);
+
+GMenuModel *           _gtk_menu_tracker_item_get_link                  (GtkMenuTrackerItem *self,
+                                                                         const gchar        *link_name);
+
+gchar *                _gtk_menu_tracker_item_get_link_namespace        (GtkMenuTrackerItem *self);
+
+gboolean                gtk_menu_tracker_item_may_disappear             (GtkMenuTrackerItem *self);
+
+gboolean                gtk_menu_tracker_item_get_is_visible            (GtkMenuTrackerItem *self);
+
+gboolean                gtk_menu_tracker_item_get_should_request_show   (GtkMenuTrackerItem *self);
+
+void                    gtk_menu_tracker_item_activated                 (GtkMenuTrackerItem *self);
+
+void                    gtk_menu_tracker_item_request_submenu_shown     (GtkMenuTrackerItem *self,
+                                                                         gboolean            shown);
+
+gboolean                gtk_menu_tracker_item_get_submenu_shown         (GtkMenuTrackerItem *self);
+
+#endif
diff --git a/gtk/gtkmenutrackerprivate.h b/gtk/gtkmenutrackerprivate.h
new file mode 100644 (file)
index 0000000..210fe2d
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2013 Canonical Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_MENU_TRACKER_PRIVATE_H__
+#define __GTK_MENU_TRACKER_PRIVATE_H__
+
+#include "gtkmenutrackeritemprivate.h"
+
+typedef struct _GtkMenuTracker GtkMenuTracker;
+
+typedef void         (* GtkMenuTrackerInsertFunc)                       (GtkMenuTrackerItem       *item,
+                                                                         gint                      position,
+                                                                         gpointer                  user_data);
+
+typedef void         (* GtkMenuTrackerRemoveFunc)                       (gint                      position,
+                                                                         gpointer                  user_data);
+
+
+GtkMenuTracker *        gtk_menu_tracker_new                            (GtkActionObservable      *observer,
+                                                                         GMenuModel               *model,
+                                                                         gboolean                  with_separators,
+                                                                         gboolean                  merge_sections,
+                                                                         gboolean                  mac_os_mode,
+                                                                         const gchar              *action_namespace,
+                                                                         GtkMenuTrackerInsertFunc  insert_func,
+                                                                         GtkMenuTrackerRemoveFunc  remove_func,
+                                                                         gpointer                  user_data);
+
+GtkMenuTracker *        gtk_menu_tracker_new_for_item_link              (GtkMenuTrackerItem       *item,
+                                                                         const gchar              *link_name,
+                                                                         gboolean                  merge_sections,
+                                                                         gboolean                  mac_os_mode,
+                                                                         GtkMenuTrackerInsertFunc  insert_func,
+                                                                         GtkMenuTrackerRemoveFunc  remove_func,
+                                                                         gpointer                  user_data);
+
+void                    gtk_menu_tracker_free                           (GtkMenuTracker           *tracker);
+
+#endif /* __GTK_MENU_TRACKER_PRIVATE_H__ */
index ede101df55e52e42293cd034dda63e3a9eeb7436..57c333536b2d8b6aab168a89b5681d5605d9fed7 100644 (file)
@@ -24,7 +24,7 @@
 #include "gtkbutton.h"
 #include "gtkbuttonprivate.h"
 #include "gtkwidgetprivate.h"
-#include "gtkmenutrackeritem.h"
+#include "gtkmenutrackeritemprivate.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtkbox.h"
index 5d7637219f14de0d59d9e5ab3ad7e6df7ed11e2c..b52e126053a09757e3678bf16635ef38d6233948 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gtkmodelmenuitem.h"
+#include "gtkmodelmenuitemprivate.h"
 
 #include "gtkaccellabel.h"
 #include "gtklabel.h"
diff --git a/gtk/gtkmodelmenuitem.h b/gtk/gtkmodelmenuitem.h
deleted file mode 100644 (file)
index 8dbdbb0..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2011 Canonical Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __GTK_MODEL_MENU_ITEM_H__
-#define __GTK_MODEL_MENU_ITEM_H__
-
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkmenutrackeritem.h>
-
-#define GTK_TYPE_MODEL_MENU_ITEM                            (gtk_model_menu_item_get_type ())
-#define GTK_MODEL_MENU_ITEM(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
-                                                             GTK_TYPE_MODEL_MENU_ITEM, GtkModelMenuItem))
-#define GTK_IS_MODEL_MENU_ITEM(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
-                                                             GTK_TYPE_MODEL_MENU_ITEM))
-
-typedef struct _GtkModelMenuItem                            GtkModelMenuItem;
-
-G_GNUC_INTERNAL
-GType                   gtk_model_menu_item_get_type                    (void) G_GNUC_CONST;
-
-G_GNUC_INTERNAL
-GtkWidget *             gtk_model_menu_item_new                         (void);
-
-#endif /* __GTK_MODEL_MENU_ITEM_H__ */
diff --git a/gtk/gtkmodelmenuitemprivate.h b/gtk/gtkmodelmenuitemprivate.h
new file mode 100644 (file)
index 0000000..92be6a3
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2011 Canonical Limited
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the licence, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Ryan Lortie <desrt@desrt.ca>
+ */
+
+#ifndef __GTK_MODEL_MENU_ITEM_PRIVATE_H__
+#define __GTK_MODEL_MENU_ITEM_PRIVATE_H__
+
+#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtkmenutrackeritemprivate.h>
+
+#define GTK_TYPE_MODEL_MENU_ITEM                            (gtk_model_menu_item_get_type ())
+#define GTK_MODEL_MENU_ITEM(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                      \
+                                                             GTK_TYPE_MODEL_MENU_ITEM, GtkModelMenuItem))
+#define GTK_IS_MODEL_MENU_ITEM(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                      \
+                                                             GTK_TYPE_MODEL_MENU_ITEM))
+
+typedef struct _GtkModelMenuItem                            GtkModelMenuItem;
+
+G_GNUC_INTERNAL
+GType                   gtk_model_menu_item_get_type                    (void) G_GNUC_CONST;
+
+G_GNUC_INTERNAL
+GtkWidget *             gtk_model_menu_item_new                         (void);
+
+#endif /* __GTK_MODEL_MENU_ITEM_PRIVATE_H__ */
index 55db0e23cfc8382903d51dbe0706a9c5be68df6b..660688836dc58adb8eb4451fd908f68a22449777 100644 (file)
 #include "gtkprivate.h"
 #include "gtkmain.h"
 #include "gtkstack.h"
-#include "gtkmenusectionbox.h"
+#include "gtkmenusectionboxprivate.h"
 #include "gdk/gdkeventsprivate.h"
 #include "gtkpointerfocusprivate.h"
 #include "gtkcssnodeprivate.h"
index 3c570c1d450adcf2754093285b864e7693a17699..7e922c6dc11016635491da7c5c4953260e367450 100644 (file)
 #include "gtkstack.h"
 #include "gtkstylecontext.h"
 #include "gtkintl.h"
-#include "gtkmenusectionbox.h"
+#include "gtkmenusectionboxprivate.h"
 #include "gtkmenubutton.h"
 #include "gtkactionmuxerprivate.h"
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
 #include "gtkpopoverprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkeventcontrollerkey.h"
index 023ae4cd42988d87f0e8359b6a38f4f32a2058b3..efbeac4ae44b5bd196f00447ab37c115d7719424 100644 (file)
@@ -63,7 +63,7 @@
 #include "gtkeventcontrollerkey.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkactionmuxerprivate.h"
-#include "gtkmenutracker.h"
+#include "gtkmenutrackerprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkmain.h"
 #include "gtknative.h"